* lisp/simple.el (command-execute): Respect nil disabled-command-function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f93bfe84af6e7da5fc758217291515541b2a3f96..3821bf5f73e1e03922640cbc5b50ba07897b4a85 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-02  Glenn Morris  <rgm@gnu.org>
+
+       * simple.el (command-execute): Respect nil disabled-command-function.
+
 2014-04-01  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
 
        * simple.el (command-execute): Do not execute the command when it

diff --git a/lisp/simple.el b/lisp/simple.el
index 10a3a98973dcb797374cec6724af01e505925a48..68bfd7b14f4d62678c1241911ad45766088c2f82 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1629,7 +1629,8 @@ a special event, so ignore the prefix argument and don't clear it."
                        (setq current-prefix-arg prefix-arg)
                        (setq prefix-arg nil)))))
     (if (and (symbolp cmd)
-             (get cmd 'disabled))
+             (get cmd 'disabled)
+             disabled-command-function)
         ;; FIXME: Weird calling convention!
         (run-hooks 'disabled-command-function)
       (let ((final cmd))